rust: update to 1.87.0

Simplify the build invocation and reorder the target list to avoid
failures due the build process changes.

Signed-off-by: Luca Barbato <[email protected]>
(cherry picked from commit 95eef0fd580a411bd487ccf61a8d4bd25beab5c2)

diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index f63c5a5a8a75b7e2f2ab2b06114c1a25413d0ae1..290a2fb78b2507112c00047bb94b9b23266d4258 100644 (file)
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rust
-PKG_VERSION:=1.85.0
+PKG_VERSION:=1.87.0
 PKG_RELEASE:=1
 
 PKG_SOURCE:=rustc-$(PKG_VERSION)-src.tar.gz
 PKG_SOURCE_URL:=https://static.rust-lang.org/dist/
-PKG_HASH:=2f4f3142ffb7c8402139cfa0796e24baaac8b9fd3f96b2deec3b94b4045c6a8a
+PKG_HASH:=149bb9fd29be592da4e87900fc68f0629a37bf6850b46339dd44434c04fd8e76
 HOST_BUILD_DIR:=$(BUILD_DIR)/host/rustc-$(PKG_VERSION)-src
 
 PKG_MAINTAINER:=Luca Barbato <[email protected]>
@@ -90,8 +90,7 @@ define Host/Compile
        TARGET_CFLAGS="$(TARGET_CFLAGS)" \
        $(PYTHON) $(HOST_BUILD_DIR)/x.py \
                --build-dir $(HOST_BUILD_DIR)/build \
-               --config $(HOST_BUILD_DIR)/config.toml \
-               dist build-manifest cargo llvm-tools rustc rust-std rust-src
+               dist build-manifest rustc rust-std cargo llvm-tools rust-src
 endef
 
 define Host/Install

diff --git a/lang/rust/patches/0003-bump-libc-deps-to-0.2.146.patch b/lang/rust/patches/0003-bump-libc-deps-to-0.2.146.patch
deleted file mode 100644 (file)
index 06ffb70..0000000
--- a/lang/rust/patches/0003-bump-libc-deps-to-0.2.146.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-This patch bumps all libc dependencies and checksums to 0.2.147, which includes the fix for musl 1.2.4.
-
---- a/vendor/elasticlunr-rs-3.0.2/Cargo.lock
-+++ b/vendor/elasticlunr-rs-3.0.2/Cargo.lock
-@@ -555,9 +555,9 @@ checksum = "e2abad23fbc42b3700f2f279844d
- 
- [[package]]
- name = "libc"
--version = "0.2.140"
-+version = "0.2.147"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
-+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
- 
- [[package]]
- name = "lindera"
---- a/vendor/libffi-3.2.0/Cargo.lock
-+++ b/vendor/libffi-3.2.0/Cargo.lock
-@@ -10,9 +10,9 @@ checksum = "50d30906286121d95be3d479533b
- 
- [[package]]
- name = "libc"
--version = "0.2.140"
-+version = "0.2.147"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "99227334921fae1a979cf0bfdfcc6b3e5ce376ef57e16fb6fb3ea2ed6095f80c"
-+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
- 
- [[package]]
- name = "libffi"